From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 May 2011 21:17:47 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3658^2~4
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a127aab86c09ec8bfa3fc7a8c548fe671c69267e;p=emacs.git

Merge from trunk.
---

a127aab86c09ec8bfa3fc7a8c548fe671c69267e